Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cabal: Add flag to ignore build tool dependencies (backport #10128) #10159

Closed
wants to merge 1 commit into from
Closed

Cabal: Add flag to ignore build tool dependencies (backport #10128) #10159

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 28, 2024

Add a flag to disable the hard requirement on the
build-tools-(depends) declared on the Cabal package.

When this flag is enabled (--ignore-build-tools), a build-tool which can't be found does not block compilation.

Fixes #10061

Please read Github PR Conventions and then fill in one of these two templates.

Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:

@alt-romes @mergify
Cabal: Add flag to ignore build tool dependencies
7e78f07 
Add a flag to disable the hard requirement on the
build-tools-(depends) declared on the Cabal package.

When this flag is enabled (--ignore-build-tools), a build-tool which
can't be found does not block compilation.

Fixes #10061

(cherry picked from commit ef56d72)

# Conflicts:
#	Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
#	cabal-install/src/Distribution/Client/Setup.hs
@mergify mergify bot added the conflicts label Jun 28, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jun 28, 2024

Cherry-pick of ef56d72 has failed:

On branch mergify/bp/3.12/pr-10128
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit ef56d7257.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cabal/src/Distribution/Simple/Configure.hs
	modified:   Cabal/src/Distribution/Simple/Setup/Config.hs
	modified:   cabal-install/src/Distribution/Client/Config.hs
	modified:   cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs
	modified:   cabal-install/src/Distribution/Client/ProjectPlanning.hs
	new file:   cabal-testsuite/PackageTests/IgnoreBuildTools/Hello.hs
	new file:   cabal-testsuite/PackageTests/IgnoreBuildTools/client.cabal
	new file:   cabal-testsuite/PackageTests/IgnoreBuildTools/setup.out
	new file:   cabal-testsuite/PackageTests/IgnoreBuildTools/setup.test.hs
	new file:   changelog.d/pr-10128

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
	both modified:   cabal-install/src/Distribution/Client/Setup.hs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jun 28, 2024
Merged
5 tasks
@mergify mergify bot added the backport label Jun 28, 2024
@geekosaur geekosaur closed this Jun 28, 2024
@mergify mergify bot deleted the mergify/bp/3.12/pr-10128 branch June 28, 2024 17:09
@geekosaur
Copy link
Collaborator

Can't backport due to versioned options which indicate it's only applicable to 3.13 (practically, 3.14).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@geekosaur @alt-romes